Merge "Update the flag check repohook to be same as go/android-flag-directive" into main