[automerger skipped] Merge changes from topic "cherrypick-cherrypick-cherrypick-nnapi_burst_deserialize-fvwo2wt1ja-mueq5vhv8v-2ym2uz8wjy" into sc-qpr1-dev am: c63fef57a2 -s ours am: 87279d70a9 -s ours am: 8662e87ac4 -s ours am: 577961260b -s ours

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

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

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