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