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

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



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