Merge "Release mDrmManagerClient in PduPersister release" am: 501a618b3e
am: 92ea429e94

Change-Id: I22ccb23cef4a297d0352942dc7b9caab24fec50c