[automerger skipped] Merge "Fix implict bp broken ui." into 24D1-dev am: f5ee63e9 -s ours

am skip reason: Merged-In I04eb34ba3e2e118e4b4b9f5c8c023945880c38ff with SHA-1 91669d64 is already in history

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



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