Merge "Merge "Use more face-acquired frames for msg deferral" into tm-qpr-dev...

Merge "Merge "Use more face-acquired frames for msg deferral" into tm-qpr-dev am: 99b6f2bd" into tm-qpr-dev-plus-aosp am: 4834c3e6

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



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