Merge TQ1A.230205.002 am: c1672ee709

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

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