[automerger skipped] Merge "LINK_CONFIGURATION_CHANGED broadcast: stop...

[automerger skipped] Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into rvc-qpr-dev am: f535f0a0 am: e682f082 -s ours

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

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

Change-Id: I4e47cb2288c959f70ce8262e3f6fbd79a871305f