Merge "Replace ContentProvider SQL args w/ Bundle & Constants."