[automerger skipped] Merge "Update test to TEST_P" am: ecb916ba am:...

[automerger skipped] Merge "Update test to TEST_P" am: ecb916ba am: 78647cdb -s ours am: b623c176 -s ours

am skip reason: Merged-In Ib35c3c06fbe3fa2205bdcd44f70bda805fcb8301 with SHA-1 c16f1583 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1727510

Change-Id: I68adfbd61559a473160a616bcb10719a19ed5820