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

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



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