Merge "[Bouncer] destroy and recreate view when..." into tm-qpr-dev am: 0bb041d6 am: f820fa35

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



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