Merge "Add feature provider for face unlock" into qt-qpr1-dev am: 8472279900

Change-Id: I3334a10c25af3b5a8ed125495c7012fe46516485