[automerger skipped] Merge "Add DEFAULT_NETWORK_PRIORITY constants" am: c323f6502d am: 136bd35a67 -s ours

am skip reason: Merged-In I0ea71b348492aeb4784d487bed4cfd5d387426ba with SHA-1 c2198778ab is already in history

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

Change-Id: Id9376bb7d70324225771e19e48f4e0a30bb320ed