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