Merge "Show FACE_COVERING and DARK_GLASSES messages" into tm-d1-dev am: b71d120e am: d27b2962

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



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