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

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



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