[automerger skipped] Merge changes from topic "primary-aidl-hal" into udc-qpr-dev am: 85abc3148d -s ours am: 85579a4291 -s ours

am skip reason: Merged-In Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43 with SHA-1 4bf6899cc7 is already in history

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

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