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