[automerger skipped] update hidl .bp am: d610435a am: f6813ceb -s ours am:...

[automerger skipped] update hidl .bp am: d610435a am: f6813ceb -s ours am: 46357a88 -s ours am: 7027b7f8 -s ours am: 15c189cd -s ours

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

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

Change-Id: I7a7f7637a06ceb91f9bd8747800f3972603a0d04