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

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

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



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