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