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: 0bbe1b88 am: 844ecd5d

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



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