Merge "Destroy and reinflate bouncer before showing" into tm-qpr-dev am: 1ac8c7c4

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



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