Merge "Fallback should be evaluated for each preference" am: 5ea6f517a6

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

Change-Id: If043e88061821f8b408aa15fdb4c863472c53067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>