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