Merge changes from topic "aosp-nnapi-qos" am: 27cfaa82f8

Change-Id: Idddbc23f3b5c2f53b5a376ab1d7930076d97aa70