Merge "Add support for AIDL traces for Priv apps"