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