Merge "Annotate MediaPlayer2 DRM APIs with @NonNull/@Nullable"