Merge "Ensure content-overlay is removed on app re-launch" into tm-dev am:...

Merge "Ensure content-overlay is removed on app re-launch" into tm-dev am: 999a0666 am: 4951e22b am: 94472bb3

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



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