Merge "Don't re-trigger face auth from notification shade" into rvc-dev am: 3940a99593 am: 918f98eb04

Change-Id: I071f2ce1076bcfd6ad9bcbf72fe39cc277391e94