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