Merge "Release SC when RootTaskDA is no longer organized" into tm-dev am: d72491683d

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

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