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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1654e80efdc6e61cfeea53b785e74b74c1fd4bc