[automerger skipped] Merge "[RESTRICT AUTOMERGE] Send DA's config directly...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Send DA's config directly when attaching to DA" into sc-qpr1-dev am: c72d4fc1 am: 8f79c108 -s ours am: 007ffbed -s ours

am skip reason: subject contains skip directive

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

Change-Id: I62f0d4be31d56bee16d3588611430d874bc4928b