[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ab7970c3f0 -s ours am: 3136dd536f -s ours

am skip reason: Merged-In I1029aa1b218753f3b761cff4718320b76348deca with SHA-1 dfac6c3006 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24624533

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