Ignore enrollAfterFace in FaceEnroll from ext pkg

Remove key of enrollAfterFace in FaceEnroll if this intent is coming
from external package

Bug: 433252423
Flag: EXEMPT BUGFIX
Test: atest FaceEnrollTest
(cherry picked from commit 7ac22f2eae5d3e8e65bc7f8db5a173231ebba071)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:c602fa951f06c4ae8b3fa4653e545fecd3e87193
Merged-In: Ibbb6340163613ea955516f11579d767b2ade4312
Change-Id: Ibbb6340163613ea955516f11579d767b2ade4312
2 files changed