[automerger skipped] Merge "HalProxy unit test to expose incorrect...
[automerger skipped] Merge "HalProxy unit test to expose incorrect numEventsOnPendingQueue" into rvc-dev am: 0dad3a63 -s ours
am skip reason: Change-Id Ia6fe3cafc1c2adb02463c28481bcf4c723551860 with SHA-1 2f4ac159 is in history
Change-Id: If61a42301b594a91c1f8224e2474934cba640578