This flag conflates these two things, but it's a lot clearer if they are separate and evaluated at the end. Moreover, a new policy will make use only of one of them, so having them separate is also useful going forward. Test: FrameworksNetTests Change-Id: Ia47b3974277cf76153a53d7e8a0e969c90ba78f4