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