[automerger skipped] Prevents activity being stopped while folding/unfolding device am: fc8087ce7b -s ours
am skip reason: Merged-In I687f35f4989f9e23276451c9b3a3ce8578e64280 with SHA-1 0687f9d3cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22779400
Change-Id: I534bb76817c797ed6adb46bf003eb04dc31196e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: