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

Change-Id: I4e7a7be5cc082ec5d3e5b1f8ca0842e1632b9bfb