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