Merge "Add metadata in direct display surface to support ANativeWindow use...
Merge "Add metadata in direct display surface to support ANativeWindow use cases." into oc-mr1-dev am: b5e8b5dd am: 269aa5e7 am: 10288989
am: bf598336
Change-Id: I48eb466b650568809a8648f185c360028194593b