[automerger skipped] Merge "[DO NOT MERGE] Remove duplicate face re-enroll...

[automerger skipped] Merge "[DO NOT MERGE] Remove duplicate face re-enroll notification" into udc-qpr-dev am: cbb23b0b am: 5eb6a4de -s ours

am skip reason: subject contains skip directive

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



Change-Id: I7b9fe34273215828957857ed63aa170d12173c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>