Merge "Don't trigger face or active unlock on display group added" into udc-qpr-dev am: 07702af2

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



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