Merge "Fix BP face icon being clickable with no action" into udc-d1-dev am: e43400a9

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



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