Merge "Fix NNAPI HIDL 1.3 VTS MemoryDomainExecutionTest" am: 97a7435d5f am: 3248647a41

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

Change-Id: I68bb9009f4664c7a5cef859061dc1ff3becf5bb9