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