Merge "Add support for AIDL traces for Priv apps" am: 93dae4bc8f am: 4c17cc1766

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

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