Merge "Add updateLockTaskPackages API to ActivityTaskManager"