Merge "Add additional checks to multicast tests" into oreo-cts-dev am: d7ab0877dc
am: a6169c3df7  -s ours

Change-Id: I903b97aa7d5f79be5ecfb03f7df824664dfa1037