Merge "Fix and re-enable QSFragmentTest" into tm-dev am: a84dc9b870

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

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