Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev