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