Loading
Merge "Merge "Don't trigger face or active unlock on display group added" into...
Merge "Merge "Don't trigger face or active unlock on display group added" into udc-qpr-dev am: 07702af2" into udc-qpr-dev-plus-aosp am: 65d296db Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24308913 Change-Id: I3bfedbcdf84cf2603c6911b15ec2583f2ebfeb60 Signed-off-by:Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>