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