Merge "Add cheap aidl tracing suitable for always-on-tracing (3/3)"