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: I82f6fadb62af6be0f1ef2b421cf3e3e46717fdf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>