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

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60