am dcc7aadb: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" into stage-aosp-master

* commit 'dcc7aadb96e3c408d301377827de24f5f9bfe63f':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces