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