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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9b6be58ea7a7ae5de245f9ba3d38943166d89b8