Merge "Check for Valid Frame Rate in Header" into security-aosp-mnc-mr1-release