Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
Change-Id: Ie56daaaf7d1e9dfddf0dcd1adda00a3732671b0d
diff --git a/services/inputflinger/tests/Android.bp b/services/inputflinger/tests/Android.bp
index c4f8626..21ed7ce 100644
--- a/services/inputflinger/tests/Android.bp
+++ b/services/inputflinger/tests/Android.bp
@@ -25,6 +25,7 @@
         "libutils",
         "libhardware",
         "libhardware_legacy",
+        "libhidlbase",
         "libui",
         "libinput",
         "libinputflinger",