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

Change-Id: I4ddc9bf00a16b068244d98ed1b324b5f9ea25410