Merge "Fix build breakage from setLockTaskPackages API change" into lmp-dev