Merge "Add Wallpaper scale methods to be used by WallpaperPicker" into...
Merge "Add Wallpaper scale methods to be used by WallpaperPicker" into rvc-d1-dev am: adba2d2c am: 1a59d295 am: 4e9f7b60 am: eb712ccf
Change-Id: I31fc9d2c7135104ce2cb44fc4cb1caefce4c3d0e