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