Merge "Revert "Revert "Update face detectInteraction""" into sc-dev am: d01ed12c5d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14147116

Change-Id: Iaa5a9d1abddfe1e1c94f8e87b6094704bd0a2bde