Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Protected App [2/3]
 Protected Apps Settings -> Apps:
 - Added Receiver which can send in a call to PackageManager to toggle a components protected status.
 - Add Protected Apps activity (available from Apps fragment)
 - Reads from ApplicationInfo state
 - Requires Pattern Lock to view/modify protected apps
 - Updates Settings Secure DB with protected components
 - Support resetting protected apps pattern lock

Change-Id: If07a7b69ac963ffae855621881e1944fc8754782
Settings: Modify AOSP JA translation

usage_type_on_time is supposed to the cell standby use time(使用時間),
but it says screen use time(点灯時間) in Japanese. It should be corrected.

Change-Id: Ic9b7f61a054d09cf7944d6d37f70c8dbb294c095
Automatic translation import

Change-Id: I2db8cb59213162e87273d86fdc5189982578a776
Merge "Protected App [2/3]  Protected Apps Settings -> Apps:  - Added Receiver which can send in a call to PackageManager to toggle a components protected status.  - Add Protected Apps activity (available from Apps fragment)  - Reads from ApplicationInfo state  - Requires Pattern Lock to view/modify protected apps  - Updates Settings Secure DB with protected components  - Support resetting protected apps pattern lock" into cm-11.0
Move protected apps strings to cm_strings

Change-Id: I7099ac4a817fa3db8d418b329b9a3344aea1da69
Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	AndroidManifest.xml