[automerger skipped] Prevents activity being stopped while folding/unfolding...

[automerger skipped] Prevents activity being stopped while folding/unfolding device am: fc8087ce -s ours am: f06b75ba -s ours am: 580104b1 -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: I9a0ef8b630da27ac1dc404ceb54aa046d14cccd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>