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: Iad55006665d87bc8e7a9e6df6225f359cde62dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>