Merge "Merge "Fix job scheduler crash due to uninstall race" into nyc-mr1-dev am: 24ab3aafe2 am: 35bf3b9ab8" into nyc-mr1-dev-plus-aosp
am: f42ec107cf

Change-Id: I1b645cabe01ef922c4ccec8b43bb2519f41f77c0