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

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

Change-Id: Ia9bafc9e7a3742c22379d1ca5bbc0718f928004f