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