am 129d5782: am 969a0647: Merge "Improve robustness of MediaDrm after...
am 129d5782: am 969a0647: Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
* commit '129d5782':
Improve robustness of MediaDrm after mediaserver crash