Merge "Keep off displays in trace" into udc-dev am: 145c4ac0

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



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