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