Merge "Re-add LoaderCallbacks to CyanogenMod dialer" into cm-11.0