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

Change-Id: I06ced96e1d64aba7f0b67a390e5358f4cbb9ae77