Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367 am: 2ca4a6f36a

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

Change-Id: I0876dc9bbf39aca17d0ba7caa0f26d3ed4176c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>