[automerger skipped] Merge "Create libstatssocket_q" am: 0ba7842577 am: 7da018252b am: d5dec0c7b7 -s ours
am skip reason: Change-Id I9d113b37640345ebad6aa269ab710db0d2179671 with SHA-1 876f64cb2f is in history

Change-Id: Ifd504035fdc485fa0603b0c9ef9d6f796275e51f