Merge "Add tests for profile keys in LockSettingsStorage" into nyc-dev
am: 321cfa3

* commit '321cfa379188eee7bcc54c754bd2b7eb8f0b3c8b':
  Add tests for profile keys in LockSettingsStorage

Change-Id: If27a79a2de968d3e23ef8e5d016165240cdce8aa