[automerger] Merge "Add additional checks to multicast tests" into oreo-cts-dev am: d7ab0877 am: 321598b8 Change-Id: I986b41cbb899ce7069f22a8c8c6b0c1aaa9478d0