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