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

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

Change-Id: Ib427ac252efb72506b489ec7dde42132bd27f559