[automerger skipped] Merge "[DO NOT MERGE] Update BP "Not recognized" message...

[automerger skipped] Merge "[DO NOT MERGE] Update BP "Not recognized" message with UX/UI spec" into udc-d1-dev am: a2f387ef -s ours am: 73097e46 -s ours

am skip reason: Merged-In Ieaecf678d9498b065972340900ddb5afba97ac1e with SHA-1 a9eef654 is already in history

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



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