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

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

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