Merge changes from topic...

Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e am: 78bdbdd2 am: 1cad7c90

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



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