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