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

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

Change-Id: I35053ba001db299ef6f4db4ea22ea75370c63ee1