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

Merge "Validate content overlay before removal" into tm-dev am: eb700c00 am: 7afb10d4 am: e768ae1e am: 3623ccb8

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



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