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: 3bb1f08d

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



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