Merge "Merge "Fix BP content description when face is not recognized" into...

Merge "Merge "Fix BP content description when face is not recognized" into udc-d1-dev am: f714ca7d am: aa8a4e16" into udc-qpr-dev-plus-aosp am: 7b594fef

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



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