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: 78248553 am: 74098c2f

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



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