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

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



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