[automerger skipped] Merge changes from topic "nnapi-numberOfConsumers" am:...

[automerger skipped] Merge changes from topic "nnapi-numberOfConsumers" am: 65de5315 am: 734a2b40 am: 4b4a5e62 am: 86a314e6 -s ours

am skip reason: Change-Id Ifee27858efd280307a299b3fe2e1a4bd9240e9de with SHA-1 323dd0c2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f381cf685fef21fa2d7868ec130250fddac61c8