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