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

Change-Id: Ieb2740c7dcfb266a211a9147211cc27addf9c537