4dd0f9c194
This reverts commit c4660c98f6a63a73df1a79c34fbbf2266a6b381e. The reverted commit removed the POLICY_YIELD_TO_BAD_WIFI exclusive bit from the EXTERNAL_POLICIES_MASK. The new policy calculation is done by bitwise-or-ing with existing policy. If the POLICY_YIELD_TO_BAD_WIFI was ever set to policy in the FullScore , CS will not be able to remove the policy to reflect the avoid bad wifi setting change since the result is always be true unless the policy is updated from factories. Eventually, the original commit is the intended design but current design could not work well with it. Thus, revert it to keep the control on CS now. Bug: 195612849 Test: atest CtsNetTestCases FrameworksNetTests Change-Id: I002e206ffd41796cb0996b9c559afed3d619b67c Ignore-AOSP-First: Commit is only available in internal branch