[automerger skipped] Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e am: 78bdbdd2 am: 1cad7c90 am: cc020a24 -s ours am: c015bacf -s ours am: 6047695b -s ours am: e2836e4f -s ours am: 38f15266 -s ours

am skip reason: Merged-In I91170ba399b3a596320b3bd9c8188912e5c4f1be with SHA-1 7cd25e1f is already in history. Merged-In was found from reverted change.

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



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