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