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

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

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