am 66cff122: am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

* commit '66cff122cc6d123b947be5f28186dc233a7be1aa':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.