Merge "Tempates with different subscriber ID should be not equal" am: 2a69e41772

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2422785

Change-Id: I51c16007c5d6b29763d07ac0fcaae3b2274f5403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>