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

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

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