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