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