Merge "Clean up the permission control code in framework"
am: 0e6d2b5f4f

Change-Id: Iff2316f72df4cff56829b281882dc920d63937bd
tree: 12aa0891d546897bd6ed307a179b137dceafd958
  1. core/
  2. services/
  3. tests/