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

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

Change-Id: Idfef067e16538642d33c0a2989b6d5bd68f14db3