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

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



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