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: cdb2575d am: 85dfaa2a am: e5c9a6bb

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



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