[automerger skipped] Merge "Clean up previous DA organizer when registering"...

[automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1a -s ours am: 6e8c4ca6 -s ours am: 4991f0df -s ours

am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a414 is already in history

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

Change-Id: I8ec5fc084c372dee6cb138ba6cea79ef86073e6a