Settings: fixed battery stats app list

http://jira.omnirom.org/browse/OMNI-493

The check of mAppListGroup getPreferenceCount is no longer working
after we added other options on this page. Add a separate counter to get
back the full possible list of 12 apps

PS3:
IMHO the number of apps should be 10 if we have
MAX_ITEMS_TO_LIST = 10

Change-Id: I679b01deec0f52d4fa2012a31b7b305f8fe176b5
Merge "Settings: fixed battery stats app list" into android-4.4
Settings: fix security settings

http://jira.omnirom.org/browse/OMNI-504

Change-Id: I857ca730dee460b2fdef81fbd0b23d0821f3e0bd
merge changes from Omni 4.4 into local branch

Conflicts:
	src/com/android/settings/SecuritySettings.java

Change-Id: I219557494ae116ca66365fa1e92bdf3c5222f5d7