Merge "Destroy and reinflate bouncer before showing" into tm-qpr-dev am: d3d710e8 am: f24c87c0

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



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