Merge "Clean up the permission control code in framework" am: 78d6a42e99
am: a4cbe3d728

Change-Id: I1af059171c5d80be7abaee636f012f3b55dac2df