Merge "Introduce AlternativeNetwork APIs"
am: 98966bcbb6

Change-Id: I743fd447fef38c276b105d005c95033fe0393b7e