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