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

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

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