Revert "display: merge aosp change"
we're not ready for this yet ...

This reverts commit 8938aee6913743fc963cb6e723ab1fc03c79b191.