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

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



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