Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8fa am: fa3e41dd am: ea206856

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

Change-Id: Ib427ac252efb72506b489ec7dde42132bd27f559