Merge "Merge "Add all the new revamped bouncer messages and the prompt reasons...

Merge "Merge "Add all the new revamped bouncer messages and the prompt reasons for them." into udc-dev am: e159a60b am: 6e6277ae" into udc-qpr-dev am: 7da47d89

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



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