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