Merge "Revert "Apply requested DRM info test changes"" into nougat-cts-dev