Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755 am: f80a3ee1 am: 8c5597aa am: 64905c00

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



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