Merge "Add more tracing" into sc-v2-dev am: 17456caf69 am: 98d1aae6e0

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

Change-Id: Iae96de421044154dcb41c90e168cfcc2e6bcad72