Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face

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

Change-Id: Ibbd8d506f450fbe1c5cc337e95759cb8403e7d0e