Merge "[Bouncer] Separate keyguard message areas." into tm-qpr-dev am: 87c84cb8 am: f5a8749a

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



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