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