Merge "Merge "Revert "Clean up previous DA organizer when registering"" into...

Merge "Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc am: c817fba8" into sc-v2-dev-plus-aosp am: 49c522cd

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

Change-Id: I918151d1e465e600a0c8b0cc6910435057cfd9c6