[automerger skipped] Merge "Migrate SystemUITests to Android.bp" into...

[automerger skipped] Merge "Migrate SystemUITests to Android.bp" into tm-qpr-dev am: fd1b49be -s ours am: cadd377a -s ours

am skip reason: Merged-In I24fa1546182d7609a85cf31ddf7e24ac7f4c18f0 with SHA-1 85984eb3 is already in history

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



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