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

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



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