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

Change-Id: I0293fabf32c89fc9d7cb84c573b84ef807601fdf