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