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: f7a00887 am: 3d21ed3b

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



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