[automerger skipped] Merge "Improve QrCodeGenerator.encodeQrCode performance"...

[automerger skipped] Merge "Improve QrCodeGenerator.encodeQrCode performance" into udc-qpr-dev am: 012ccd24 am: 1577629b -s ours

am skip reason: Merged-In I6e1be2e394764c3bb19db23f18070f71b80c31e7 with SHA-1 f8d17833 is already in history

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



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