Merge "Add new permission for am.updateLockTaskPackages()" into nyc-dev