am 0c0d5463: resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402

am 0c0d5463: resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402

* commit '0c0d54637af7109ae22e21a117dba3efdaded4b5': (500 commits)
  Adding minSpanX and minSpanY for all the launcher widgets
  [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets
  Query the title and icon for app using correct user handle.
  Fix issue where corp app widget doesn't show correctly on drop targets.
  [DO NOT MERGE] fixing build break
  Fixing AppWidgetInfo not initialized with proper user
  [Do NOT MERGE] Fixing AppWidgetInfo not initialized with proper user
  Fix issue with UiThreadReveal on L devices
  Import translations. DO NOT MERGE
  Using highres icons for backup
  Import translations. DO NOT MERGE
  Widget row should not be cut off on the right, when there is an indent
  Fixing shortcuts not getting migrated to app icons
  Fixing regression in calculating workspace padding.
  Hide spammy WidgetModel log behind a DEBUG flag
  Import translations. DO NOT MERGE
  Animation should start and finish on widgets button when opening/closing widget tray.
  Making long-press of AllApps to jump directly to search.
  Computing the visible cell layout area without using the current scroll
  Fixing overscroll not drawn in rtl
  ...