am 17dc2ef5: am a1908a19: Merge "Allow WallpaperManager to return desired size of 0" into klp-modular-dev

* commit '17dc2ef55ef5ecc3768206a704cf42588c273f7c':
  Allow WallpaperManager to return desired size of 0