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