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