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