Merge "[DO NOT MERGE] Remove duplicate face re-enroll notification" into udc-d1-dev am: fa6cb652

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



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