[automerger skipped] Merge "[SP32.1] Put OffloadControl 1.1 HAL into apex" am:...

[automerger skipped] Merge "[SP32.1] Put OffloadControl 1.1 HAL into apex" am: e3dc2f88 am: 6b450ba4 -s ours am: 03b66892 -s ours

am skip reason: Merged-In I0e4dc6758d87c320fc622da06144b4ceceb91964 with SHA-1 184e35a4 is already in history

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

Change-Id: I38487a34f51111b9a272b031eddc58b041b9bd18