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