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