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

Change-Id: Ic0d56aafaeb72135fba107616a664f9845bd81f8