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