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