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