[automerger skipped] Merge "[CDM] Update AssociationInfo.Builder" into...

[automerger skipped] Merge "[CDM] Update AssociationInfo.Builder" into udc-dev-plus-aosp am: 90f2ecfc am: 1ee7ad90 am: fecae09a -s ours

am skip reason: Merged-In I6911e63c0047b18357b69f3b3392daa408dbf603 with SHA-1 e9cb0904 is already in history

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



Change-Id: Idf0122ed46130c40db764b25f43c54aa49be2855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>