Merge "Remove co-ex logic for blocking face help msgs" into tm-dev am: a9b6e8c3 am: 2bc621b8

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



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