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

Merge "Keep off displays in trace" into udc-dev am: 145c4ac0 am: 9a7c3de1 am: 1bcd37e5 am: b1a4bec4

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



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