Merge "Codec2CommonUtils: Restrict encoder usage checks to Android U and above" into main