Merge \"Pinner Service - Pin Camera app on unlock if requested by the config\" into nyc-mr1-dev
am: e260ba666f

Change-Id: I460e52ac73c0836c72a313cb890971e8a0767ef8