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: 3c011511 am: 2486db32

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



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