[automerger skipped] Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6 am: 10211c1f68
am: e3630c858a  -s ours

Change-Id: I2c6c1300a6a5ffec779ee1010f5bd96e260d6148