Merge "Add null-check before reparenting content overlay" into tm-dev am: c3b917ad am: 4e5905d4 am: 62cb0d20

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



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