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