am 44f9f23e: merge from open-source master

Merge commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7'

* commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7':
  Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
tree: 30c4821d682a1d5d4f362e28127e548c1c30cac1
  1. policy/