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