Merge changes from topic "aosp-nnapi-cf" am: 8d38d27bb9 am: f02d380818

Change-Id: I0bfdff0ed542b5f2a11c7d18301f6fc367f215b6