Merge "Remove target SDK check for adding REVOKED_COMPAT in setUidMode()."