[automerger skipped] Merge "[DO NOT MERGE] Convert QSFactoryImpl to use @Multibinds" into tm-qpr-dev am: 1b674edf am: e34a1258 -s ours

am skip reason: subject contains skip directive

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



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