[automerger skipped] Merge "Use new socket schema within TestSlicedCondition" into rvc-dev am: 9f9ca14bb5 am: 80013174b0 -s ours am: b4922ddd1a -s ours am: 52e2176b9a -s ours
am skip reason: Change-Id Id3c9522c4467c4869ec97226734a556dd9dfb169 with SHA-1 dfd63d4522 is in history
Change-Id: Ib5ad4be6247b5839b13b13696ff4ea178ca9480c
This commit is contained in: