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

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

Change-Id: I4d0da31854a555f3d8e039bee61fd44e0c13e03e