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