Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev