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