Merge "Merge "Add layer tracing tags in new pipeline" into nyc-dev am: f8892359 am: 1ce61201" into nyc-mr1-dev-plus-aosp