[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: 62f3aea8 am: 1839196d -s ours am: ad8d32a9 -s ours

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

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



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