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: 31fbc653 am: 3c8011f9 am: ab6b23ce

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



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