Merge "Add trace points for showing panels" into tm-qpr-dev am: 9e4022e4 am: 047f6ddf

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



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