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