Merge \"Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am: 43f6a45e7e am: 18c57b5cd5\" into nyc-mr1-dev-plus-aosp
am: fcc785679d

Change-Id: I9d116b86cc17f8fb48db317470fc1c4cf8a6e757