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

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

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