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