Merge "Revert "Destroy and reinflate bouncer before showing"" into tm-qpr-dev...

Merge "Revert "Destroy and reinflate bouncer before showing"" into tm-qpr-dev am: c573766a am: 48247597

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



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