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