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

Change-Id: I247d9e1626bc45a62980a08fe162fc537a822bbd