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