Merge changes from topic "network_policy_for_supporting_merged_wifi" into sc-dev am: 7b4645f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782680

Change-Id: I2b60f1d9a4012866f4d22a4e7a2b20610576d7be