[automerger skipped] Merge changes from topic "primary-aidl-hal" into...

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

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

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



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