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

Change-Id: I45ffe91a3f80953d54b97e2cabe84a05fc12ce8c