Merge "Merge "Account for wallpaper scale in prepareSurfaceLocked" into rvc-dev am: 661d47065f" into rvc-dev-plus-aosp am: f592260683 am: 56b594b612
Change-Id: I27b96b7680107a63d1495617d1fd6b4e199c6580
This commit is contained in: