[automerger skipped] Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into mainline-prod am: de61515593 -s ours

am skip reason: Change-Id I57c3db765283d8bbb410a0b790e27054c5ab561a with SHA-1 c8a57301ea is in history

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

Change-Id: Ib401c7f22867f8d1f47f09d1739af9e593063637