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