Merge "Keep off displays in trace" into udc-dev am: 145c4ac0f9 am: 9a7c3de10e am: 1bcd37e54e

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

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