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