[automerger skipped] Merge "[Provider Model] Add Ethernet network to Internet...

[automerger skipped] Merge "[Provider Model] Add Ethernet network to Internet Panel" into sc-qpr1-dev am: 01841cf8 am: 50787490 -s ours

am skip reason: Merged-In I5f5b8fa44f9d4b0801684b663b634138c83cff42 with SHA-1 d20de58a is already in history

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

Change-Id: I2629bf521b3a1437a1fe1ac411203d115523c0fa