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

Change-Id: I44d16150abee9dd0ec7961d1ce847d9793937354