Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev am: 6de8729657
am: 3a763e30c6

Change-Id: I0a1c145bd5c2af64af39b3884a0c54ee8c8c7cc3