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

Change-Id: Ieb85f8015e3b8439ad4e8ff010b501de28dddf11