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

Change-Id: I00a0cb7b55a46ad75259120080152d9e95346dc9