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