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