Merge "Show specific messages for why bouncer is shown before or after OTA...

Merge "Show specific messages for why bouncer is shown before or after OTA update." into udc-dev am: 28c37027 am: 62f3aea8

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



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