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

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



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