am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1

* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode