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

Change-Id: Ia61b80bf582f14108417d640ea135ab51988989a