Merge "Change order of arguments to traceAsync" into udc-qpr-dev am: ff651d3a02 am: 85816120bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23984487

Change-Id: I9dbcb5f8afa1fe30031246f5501115f63dd4eb55
Signed-off-by: Automerger Merge Worker <[email protected]>