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

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

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