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

Change-Id: Iff2316f72df4cff56829b281882dc920d63937bd