Merge "Introduce a way to debug relayouts and slow measures/layout" into tm-qpr-dev am: c2610871

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



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