Making defaultUserOptions based on category to match preferences

Also making getUserEnabledEvents check the categories

Change-Id: I561ccbb82605a6c2122330b791f3790d9dbe9078
Merge "Making defaultUserOptions based on category to match preferences"