Merge "Add the displayId to AidlComposer traces"