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
Change-Id: Ica2dfbec39fa1f0993733c291aac23d84d9b2c7b