Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp am: ea7b3d94a8

Change-Id: Ibeba7ab5d24d4c88bee7fc2e5415c0c0f0ae1887