Merge "HalProxy unit test to expose incorrect numEventsOnPendingQueue" am: 4ce37f131d am: e1d8fbe4fd am: ef10944789

Change-Id: I782ad80614fbc624f8061476f09a056608b1e319