Merge "Add a method to associate MediaDrm session with MediaCrypto"