Merge "Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: d8843b7f68" into nyc-mr1-dev-plus-aosp