Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""