Merge "Merge "Remove usage of TRACE_TAG_ALWAYS from sysui" into tm-qpr-dev am: d5244b8c am: 3a16a89e" into udc-dev