[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 -s ours am: 4ddcac9f -s ours am: c6dc79f5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6075a1548f2bfda0f23eb6bfa03f666d6afdc4cc