Merge "Set dataspace to native window" am: 1937d475f3 am: 68d7f8fc18 am: 0488b8582c am: 559a9b4455 am: b6cf343ec6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2165283

Change-Id: I83f75746d7b1279bf71b31d596231b46d602df29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>