Merge "Update taskAffinity with application uid." into rvc-dev am: 7f1ad4d34a am: 999b9558aa

Change-Id: I1e6110b9e9daae7ea82be42837a50468162746b1