[automerger skipped] Merge "Prevents activity being stopped while...

[automerger skipped] Merge "Prevents activity being stopped while folding/unfolding device" into tm-qpr-dev am: 5add7499 -s ours am: b8c9c9d3 -s ours am: b6dd823f -s ours

am skip reason: Merged-In I687f35f4989f9e23276451c9b3a3ce8578e64280 with SHA-1 0687f9d3 is already in history

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



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