Merge "Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev am: 38f1b6db am: c475730d"