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

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



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