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

Change-Id: I88f427ba574f7e2349dc20d979ba698b00edc438