Merge "Prevents activity being stopped while folding/unfolding device" into...

Merge "Prevents activity being stopped while folding/unfolding device" into udc-dev am: 5e486046 am: 638bf1ec

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



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