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