Merge "Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cc am: 1f1291cb" into nyc-mr1-dev-plus-aosp