Merge "Reduce unnecessary context creation for display" into udc-qpr-dev am:...

Merge "Reduce unnecessary context creation for display" into udc-qpr-dev am: 6b29ea2c am: 5957356c

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



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