[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev
am: 4e1078e291 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 66404a1224 is in history

Change-Id: Ia49181982198f2074a11afc881a047f86263699b