Merge "[Platform Scanner]: Update the icon of the qr scanner" into udc-dev am:...

Merge "[Platform Scanner]: Update the icon of the qr scanner" into udc-dev am: 9651d0bb am: 2eae9378

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938952



Change-Id: Icecfe6e32234beaaa979f14869c83d89f8a7a744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>