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