[automerger skipped] Merge "Skip operation on content overlay if task's...

[automerger skipped] Merge "Skip operation on content overlay if task's vanished" into sc-dev am: 5cac66cb -s ours am: d108a3a9 -s ours am: 203f0d1f -s ours

am skip reason: Merged-In I81c0622966df32e02db7cb5aa3cd42d7c4af735e with SHA-1 0a0718c6 is already in history

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

Change-Id: I44ab858620ade3bb6f3c58c518bb187925c10ff3