Merge "Add metadata in direct display surface to support ANativeWindow use cases." into oc-mr1-dev am: b5e8b5dda3
am: 269aa5e76f

Change-Id: Ica2dfbec39fa1f0993733c291aac23d84d9b2c7b