Merge "Update taskAffinity with application uid." into rvc-dev am: 7f1ad4d3 am: 999b9558 am: a2786928 Change-Id: I08bfbb6a8c21ddee72ab55a726fa8b9a953f9031