[automerger skipped] Merge "HalProxy unit test to expose incorrect numEventsOnPendingQueue" into rvc-dev am: 0dad3a6381 -s ours am: 73611c6172 -s ours
am skip reason: Change-Id Ia6fe3cafc1c2adb02463c28481bcf4c723551860 with SHA-1 14499028cf is in history

Change-Id: Iccbea4fed4573bc945753fce842a5e4efba25746