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