Merge "HalProxy unit test to expose incorrect numEventsOnPendingQueue" am: 4ce37f131d am: e1d8fbe4fd am: ef10944789 am: 0f6866f30e am: 2b1ed69e01

Change-Id: Icaa1a7f28e832bfd5d0a9c1601e735ce877e6ed5