Merge "SF: trace display power state" into udc-dev am: 939387c1 am: f4d84ebf

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



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