[automerger skipped] Merge "Replace direct pid writes with setting task profiles" am: b15c79859d am: b377fcf636 -s ours am: 706aeeeb14 -s ours am: 379a78e945 -s ours

am skip reason: Change-Id Id00370b25af973a4b3813a4a1d6ccbd1e555c87f with SHA-1 029f52b0d1 is in history

Change-Id: Ic0926323f8775f36368f3e77433e4a3aad385bfa