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

Change-Id: Iab7ee1619565b1be23d454d158d6ec33cf106c96