Merge "Merge "Check for mSurfaceController in setWallpaperPositionAndScale"...
Merge "Merge "Check for mSurfaceController in setWallpaperPositionAndScale" into rvc-dev am: c45de5ab am: c754a320" into rvc-d1-dev-plus-aosp am: 2479b93f
Change-Id: I1718db8eb6875c205870639452f0f52e3e2dfaae