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