Merge "Validate content overlay before removal" into tm-dev am: eb700c00 am:...

Merge "Validate content overlay before removal" into tm-dev am: eb700c00 am: 8cd0c550 am: 6d80e752 am: 60c51795

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



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