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