am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev

* commit '5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
  Move ContentInfoExtender from Notification.java to a support library