commit c59e530a824c19c4719da2b3e2eda62d267cda3a
author Les Lee <lesl@google.com> Wed Nov 03 19:57:54 2021 +0800
committer Les Lee <lesl@google.com> Thu Nov 04 14:12:09 2021 +0800
tree de6be40578dad52fa18919d95f7bdb10ab0567b8
parent 00e345648885810b8d1b75a03b5a5b15b58f5efa

Fix normalize doesn't work on carrier template

From android 12, the subscriberId is being used for different network
types. For instances:
The TYPE_WIFI with subscriberId means that it is a merged wifi network.
The TYPE_CARRIER means that the network associate to specific carrier
network (subscriberId).

So remove the check "isMatchRuleMobile" and only check whether subscriberId
is being used in NetworkTemplate or not.

Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I80c9f887cf8b4714716d657da92ed273a532ce27