Merge "Merge "Release SC when RootTaskDA is no longer organized" into tm-dev...

Merge "Merge "Release SC when RootTaskDA is no longer organized" into tm-dev am: d7249168 am: b32e9929" into tm-qpr-dev am: d1ede7ec am: 6b45c489

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



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