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