Use type + scope as key to build cached address map so that SAP (key: TETHERING_WIFI + INTERNET) and LOHS (key: TETHERING_WIFI + LOCAL) can use different address. Bug: 233175023 Test: atest TetheringTests (cherry picked from https://android-review.googlesource.com/q/commit:49649c9aeac709abaeb345f89b6a3a0e5a279435) Merged-In: I46a4b3ee919628092b7540202a43d79f407b09b6 Change-Id: I46a4b3ee919628092b7540202a43d79f407b09b6