Merge changes from topic "nnapi-numberOfConsumers" am: 65de531533 am: 734a2b401d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a7bc3a61e1c3730882a294589983528e9c176e