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