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

* commit 'f8c07d68c1813c6d9a05eb05951a320ace866168':
  Add new permission for am.updateLockTaskPackages()

Change-Id: I3f535dd0805225b5adf44af76edddd01f3e55ae2