Merge "Remove dual storage permission model"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/app/AppOpsManager.java
Simple merge

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc core/res/res/values/strings.xml
Simple merge