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

Change-Id: I261cd65884f81d68a7c20e4653c3f5a5d336e032