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