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: I539f31a417fd70a31557f0b3bd48c7398014e7d8