Merge "Ability for DPM to specify fallback mechanism" am: 226131ab48 am: 5854b40065 am: ae47e9143e am: 4a8f528836

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

Change-Id: Iec40b37a6a3357dbcb72f7520e2517bad1108cf8