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

* commit '4f2764717bab9175eb1a22bcd770ff52d5c955f5':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo