Merge "Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755ff am: f241da6f5d" into tm-d1-dev-plus-aosp am: 59df940cd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090282 Change-Id: I3869e80706331d2e4272ebae0ccb66ad8d989b7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: