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