Merge "SystemServer: Get rid of some unused config.* knobs."