Merge "Fix volume key events are dispatched when screen is off" into oc-dev am: 0db47f9364
am: 5bcb6e02e5

Change-Id: Idd21475441d4a97247ab651df13fa84bb93a3d7a