Merge "Allow biometric messages to show in sequence" into tm-qpr-dev am: b36b1d2e am: 65e19b29

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



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