Merge "Don't include all frames in the face help message deferral logic" into...

Merge "Don't include all frames in the face help message deferral logic" into udc-qpr-dev am: 297e7676

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



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