Merge "Only reinflate bouncer after rotation if flag enabled" into udc-qpr-dev am: 4b5d78bb32 am: 7b475a4132

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

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