Merge "Merge "Release mDrmManagerClient in PduPersister release" am: 501a618b am: 92ea429e am: 437116ad"