[automerger skipped] Merge changes from topic "ethernet_specifier" am: c77293b7 am: 2943678b am: 1764ceaa -s ours

am skip reason: Change-Id Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989 with SHA-1 4e5222b9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0133b6f49eac269c5704e5a1dbdfecc85507ae32