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