[automerger skipped] [automerge] Prevents activity being stopped while...

[automerger skipped] [automerge] Prevents activity being stopped while folding/unfolding device 2p: fc8087ce 2p: d6c699ae am: 764aa08d -s ours am: 65db19ed -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: I64312bcf41b5aab93324045418863ba697706569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>