Merge "Add method to explicitly create Surface. am: 4e623e259c am: 84051d9c97" into oc-dr1-dev-plus-aosp