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