[automerge] Pass correct config values during SurfaceController creation 2p: 7b38eabe84

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/17573167

Change-Id: I762a95e7d291f1251fbcd23577c404361ba23c18