Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 6acd9fbbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905 Change-Id: I0186a8a11a18628c03491aadf3f2ce25c14b4be9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: