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: I67e8aa0a4b2c6357d4acd1a8bad2bfaa0dc69e0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>