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