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