Merge cherrypicks of ['partner-android-review.googlesource.com/2609338'] into android13-msm-pixelwatch-5.15-eos-release.

Change-Id: Idf17f87d95556227fdf726c0c0b6c7a6ed21cfba
diff --git a/petc_input_filter/petc_input_filter.c b/petc_input_filter/petc_input_filter.c
index 5cb4611..584701a 100644
--- a/petc_input_filter/petc_input_filter.c
+++ b/petc_input_filter/petc_input_filter.c
@@ -373,6 +373,17 @@
 		return false;
 	}
 
+	if (dev->id.bustype != 0) {
+		/* TODO: b/299198389
+		 *
+		 * We were matching a PnP device and filtering when we shouldn't have.
+		 * This is a temporary workaround since the devices we do want are
+		 * bustype 0. This should be cleaned up with device tree entries to be
+		 * more robust and cleaner.
+		 */
+		return false;
+	}
+
 	if (test_bit(EV_ABS, dev->evbit)) {
 		/* Don't match on a touch device */
 		return false;