tree 5ef0549cad19f7ddc205d5d9e9e79a4a65bf0d52
parent 37ca6a6a96ce5f3b962c640251e79da8da9260df
parent e34af6e97e5d060c16d11fc383bf511ab789063a
author Miranda Kephart <mkephart@google.com> 1615413560 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615413560 +0000

[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 am: 46ecf995d7 -s ours am: 55255a5a1d am: e34af6e97e -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7078fc02e6121019fe7f72bd470c10cec59e2de