[automerger skipped] Fix Race in ScreenshotController am: 0322e156a7 -s ours

am skip reason: Merged-In I0c7c9ec4e7d3dfc8896bd325bd250d372a6c0891 with SHA-1 ec86f4b99c is already in history

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

Change-Id: I4e9ea0873bc0c027aa9747c09cb85df773f5e1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>