Merge "WallpaperService crashes becuase of a log statement" into sc-dev am: c2d9287c am: 403ef209 am: e667c476

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403905

Change-Id: If176be6c1b25bc1b7ddf72e2781ddeb95de7de34