Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc am: 757ad013 am: d391e14f

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

Change-Id: I7d28142e11f9e4e95e49bb5b78bf5652a1d5dfb9