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