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: 4e5905d4 am: 96aabf11 am: 0baf3b8f

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



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