[automerger skipped] Merge "Merge "Use new socket schema within TestSlicedCondition" into rvc-dev am: 9f9ca14b am: 3f73e911 am: 75bafd8c" into rvc-qpr-dev-plus-aosp am: c6b4a49f -s ours
am skip reason: Change-Id Id3c9522c4467c4869ec97226734a556dd9dfb169 with SHA-1 dfd63d45 is in history

Change-Id: I44131150036e9ab86115872cf9e93960d49abc4f