[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-cherrypick-cherrypick-nnapi_burst_deserialize-fvwo2wt1ja-mueq5vhv8v-2ym2uz8wjy" into sc-qpr1-dev am: c63fef57 -s ours am: 87279d70 -s ours am: 8662e87a -s ours am: 57796126 -s ours am: affc214e -s ours am: 8333cda8 -s ours

am skip reason: Merged-In I6bfb02a5cd76258284cc4d797a4508b21e672c4b with SHA-1 7a9e483f is already in history

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



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