Merge changes from topic...

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

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



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