[automerger skipped] Merge "Winscope: fix .pb location for sf traces" am: 2f7f18d495
am: 19125e9c69 -s ours
am skip reason: change_id Ia84501014e6cf83d2fb1d167c1a7aac8b64a06d4 with SHA1 a938f290a0 is in history

Change-Id: I6925fa155a66bdca4c8a21146a23f3bff645e8ea