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