Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755 am:...

Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755 am: f80a3ee1 am: fda8342a am: e907834d

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



Change-Id: If9fc25db70708e180f0a21c765080797f19e4e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>