Merge "better compatibility for unusual Qualcomm/Mediatek cellular ARPHRD_* values" am: edfb9232f0 am: 55c4b7e443

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

Change-Id: Idb0a7a7edf119cf58e341e34cbe52df1a13af0ac