Merge "Add SystemApi params to framework-module defaults"