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