Merge "base: Add theme support to Ringtone and Profile pickers activi…

…ties" into cm-11.0