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