[automerger skipped] update hidl .bp am: d610435ac4 am: f6813ceb16 -s ours

am skip reason: Change-Id Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a with SHA-1 d18cba85fe is in history

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

Change-Id: I6b9ae0f5fbae95c7dea2190075223b0ffd24413b