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

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

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



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