am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature reque...

* commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
  - Some change on the DrmManager in order to support feature request 4082089.     In DrmManager, we currently lock both processDrmInfo() and onInfo() which is     ok for now since processDrmInfo() is async call, and it will return without     waiting for onInfo() call. However, if we send an event in processDrmInfo(),     we will got deadlock here because we need to invoke onInf() which will wait     for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.