Merge "Merge "Avoids leaks and major revamp of the JobScheduler sample" into nyc-mr1-dev am: 432fa5cc am: 357b996a am: 9ae51632" into nyc-mr2-dev-plus-aosp