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