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