Merge "Fix TimeStats layerName for transactions" into sc-dev am: ff9be0e8b3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14961332

Change-Id: Icf7e4e3994dd894da89fd65e0270acb4e725802d