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

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



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