resolve merge conflicts of f82aba03 to nyc-mr1-dev-plus-aosp

am: 1b1b84e9

* commit '1b1b84e9': (219 commits)
  Passing the full image and crop hint when setting the wallpaper
  Prompt to set URI wallpapers on lock screen (missed before).
  Fixing wrong grid size definitions
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Giving proper workspace description when the launcher is not loaded.
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Talkback: return correct row index inside AllApps b/27108673 b/26546781
  Add dialog to set Default Wallpaper on lock screen for N+.
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  Disable "Set wallpaper" action bar when no tile is selected.
  Prompt users to set wallpaper on lockscreen on N+.
  Removing dependency on getApplicationInfo method added in N
  Calling start/stop listening in onStart/onStop
  Fixing a typo from <array> to <string-array>
  Make com.android.launcher3.action.LAUNCH intent explicit b/27967359
  Fixing debug log
  Listen on new broadcasts for profile changes.
  No need to differentiate package event into app or updated based on a package is being updated or not
  Embedding the icon pixel size in the cache DB version. This causes the cache to get reset when the icon size changes, for eg, in case of display scale changes
  ...

Change-Id: Id20a2fd47cd4aed84182bc228e2a89070931910e