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

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



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