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

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