Merge "Remove test for QS and QQS constraints" into tm-qpr-dev am: bcd596c6 am: 8888a881

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



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