commit f5a4fb124beac4605c8086a0e88f00cdb9199001
author Cody Kesting <ckesting@google.com> Mon Jun 14 20:06:09 2021 +0000
committer Cody Kesting <ckesting@google.com> Mon Jun 14 20:51:28 2021 +0000
tree 1eccf7e61f6d266ef331ea638c1ac1ef4e052440
parent 5cbd7b38ca45bd9a898cb64e601c6a9bc81fe0d2

Keep subIds for Test NetworkCapabilities.

This CL updates NetworkCapabilities to retain configured subscription
IDs for Test NetworkCapabilities. Previously, they were cleared in
restrictCapabilitiesForTestNetwork().

Bug: 182291467
Bug: 189125789
Test: atest Ikev2VpnTest IpSecManagerTunnelTest
Test: atest CtsVcnTestCases
Change-Id: I0e1bc617910c9e8ac7b431572f276b1611acc1cb
Merged-In: I0e1bc617910c9e8ac7b431572f276b1611acc1cb
(cherry picked from commit a262a9d3d5a4d9dbabb568ea8e0a489cb29af3fe)