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