Revert "Revert "Update face detectInteraction""

This reverts commit 2a4f86bea0b6317939a724297e21e06a0913b5d6.

Reason for revert: Re-merge with NPE fixed
Fixes: 184672091

Change-Id: I68315310d9c7226584564b3b1eb3861189c7d080
19 files changed