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