Merge "Merge "Fix BP content description when face is not recognized" into udc-d1-dev am: f714ca7d6e am: aa8a4e167f" into udc-qpr-dev-plus-aosp