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