[automerger skipped] Merge "Show specific messages for why bouncer is shown...

[automerger skipped] Merge "Show specific messages for why bouncer is shown before or after OTA update." into udc-dev am: 28c37027 am: f30b4dc4 -s ours

am skip reason: Merged-In I8623cce9e9eb4c321f377f262e9831e3c3a62e93 with SHA-1 448b6f54 is already in history

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



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