Merge "Avoids leaks and major revamp of the JobScheduler sample am: 1a24e2a7 am: 37e934cc am: 643be721" into nyc-mr2-dev-plus-aosp