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: 63038446 am: 461091be

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



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