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