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