Merge "Add null-check before reparenting content overlay" into tm-dev am: c3b917ad97 am: 4e5905d45a

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

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