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

Change-Id: I0d8d74bee55f6431a2a61d26d6a54de2d67a33c4