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