Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657 Change-Id: I82f634709288f4832bac0623bc5f08ca0ecfa3f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>