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