Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103