Merge "Update FP failure bouncer & messaging logic" into tm-qpr-dev am: 5cdb41a8 am: c121056f

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



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