Merge "atrace: add priority inheritance trace point" into pi-dev
am: 7dbedde3d3

Change-Id: I6f5127a2ef327732492b081508eed3ffe86f1126