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

Change-Id: I026c74906f8f43c2eb7ca529a59b1e6be5696351