tree 7cd6ae431b5c0dc3b6a56a084ef4c424b093bb26
parent bd993a0d5f000da54108d10f13d7f69e4c6d5fa4
parent 7cc7c4c63dfe76ca6d35180bb09e9aed461d3550
author Songchun Fan <schfan@google.com> 1641943786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641943786 +0000

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f am: 09acdc8edf -s ours am: e08231618d -s ours am: 39415c5787 -s ours am: 7cc7c4c63d -s ours

am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 c981d90b49 is already in history

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

Change-Id: I81ad2720154137d35a9fe336ce22d5d6218bf7b3