Merge changes from topic "ethernet_specifier" am: c77293b7a9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1