Merge "MockDrmCryptoPlugin: Don't truncate log output" am: 0e0e0819bd am: 3d065314ad
am: ad866fd08b

Change-Id: Ic0cc856a688b5d2e879e167ae018b574e692c0c1