Merge "Add null-check before reparenting content overlay" into tm-dev am:...

Merge "Add null-check before reparenting content overlay" into tm-dev am: c3b917ad am: 17bed4b8 am: 5bc3a504 am: 9ddfefec

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



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