[automerger skipped] Merge "Use new socket schema within TestSlicedCondition" into rvc-dev am: 9f9ca14bb5 am: 3f73e911f5 am: ab1627485d am: 1b27ac92b2 -s ours
am skip reason: Change-Id Id3c9522c4467c4869ec97226734a556dd9dfb169 with SHA-1 14f56f6bc4 is in history
Change-Id: I73ea1c9af5fb05faded8f6b0d51ded7aa822b900
This commit is contained in: