Merge changes from topic "network_policy_for_supporting_merged_wifi" into...

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

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

Change-Id: Ib7f2dbc69a4618425c65df87ee9d6d8edd642ddf