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