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