[automerger skipped] Merge changes from topic "aosp-nnapi-qos" am: 27cfaa82f8 am: 1090fe7c4f am: d583986da4 -s ours
am skip reason: Change-Id If3ab91cfb3158e4c33e809ff3b149dff47cda76f with SHA-1 616701d3cd is in history

Change-Id: I442e44f64ea2f295610ef6f2ef19e74bba1604aa