Merge "better compatibility for unusual Qualcomm/Mediatek cellular ARPHRD_* values" am: edfb9232f0 am: 40cc2bdcf6 am: b207958f45

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900813

Change-Id: I89becc7282d81876a1c881236f315cdefe4e5580