Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914074'] into udc-release. am: 81f9afbd92

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

Change-Id: I1995281d79ed84ecf6b8605c885a08d6430955b2
Signed-off-by: Automerger Merge Worker <[email protected]>