Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Fix string typo mobile_unknown_sim_operator
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'AOSP/jb-mr2.0.0-release' into jb-ras-mr2.0
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0
Merge remote-tracking branch 'origin/jb-ras-mr2.0' into jb-mr2.2-test