Merge "Creates flag for controling which Quick Tap framework is used" into tm-qpr-dev am: 0110897674 am: d2f9920d65

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

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