Merge "Use sendVolumeKeyEvent API instead of sendKeyEvent API" am: e8b184be30
am: 66b026dd99

Change-Id: If8d7efb4517fda4b6cbb7080f020f2100c7bd33d