[automerger skipped] SF: Use RenderSurfaceCreationArgsBuilder am: b9ac3e112e am: 9e9d9b92ca -s ours

am skip reason: Merged-In I6b254be239b173af599c4423f190472af218dbb9 with SHA-1 b9ac3e112e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14687435

Change-Id: I843aa76a4b5243fb57fea171cb5d0f4875697ccc