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

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



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