[automerger skipped] Merge "Update AssociationInfo for VDMS test" into...

[automerger skipped] Merge "Update AssociationInfo for VDMS test" into tm-qpr-dev am: 1ced89ac am: 86da7a58 -s ours

am skip reason: Merged-In I2c92aea85b3195c226737b468430b4899cf4f354 with SHA-1 2302cba0 is already in history

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



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