Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c
Merge "Settings: Remove V+ pref if V+ isn't present" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0