[automerger skipped] Merge "Update test to TEST_P" am: ecb916bae2 am: 78647cdbd2 -s ours

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

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

Change-Id: I8d930a094d5a281ac4a3403af0924b206643a4f2