[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user...

[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616 -s ours am: 663162c3 -s ours am: 250d08c9 am: 91175a30 -s ours am: c202b083 am: 8d8067af am: 08071de0 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03b76489cb100383351f659c61b563dd0ddfa85e