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