Merge "Fixed startup profile in baseline profile" into androidx-main