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

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



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