Merge "Set dataspace to native window" am: 1937d475 am: 68d7f8fc am: 0488b858 am: 559a9b44

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



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