Merge "Merge "Check for mSurfaceController in setWallpaperPositionAndScale" into rvc-dev am: c45de5abfa am: c754a3207d" into rvc-d1-dev-plus-aosp am: 2479b93fb8 am: 2e9b81b3e3
Change-Id: I5acef79c0962acb94b319400a9585c11a1534d73
This commit is contained in: