Merge changes from topic "aosp-nnapi-memory-domain"
am: 5f675cfdd7

Change-Id: I059395ca5e9f752492de72b70d9588002c43d845