Merge "Include CtsAppFgsTestCases and CtsShortFgsTestCases in presubmit"