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

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

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