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

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



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