[automerger skipped] Merge changes from topic "cherrypick-cherrypick-cherrypick-nnapi_burst_deserialize-fvwo2wt1ja-mueq5vhv8v-2ym2uz8wjy" into sc-qpr1-dev am: d80d0c67b3 -s ours am: a5ce7b8c40 -s ours am: 6a0b3cc37e -s ours am: 568607a702 -s ours am: 7b979c106c -s ours

am skip reason: Merged-In I3461c9e33b64e7d44bb3b430c8eb00d794669037 with SHA-1 0c5444f666 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/20611321

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