Merge "Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe am: 6acd9fbb am: 86afce92" into tm-qpr-dev-plus-aosp am: 759cfc51

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



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