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