[automerger skipped] Clean up the permission control code in framework am: 66404a1224 -s ours
am:8b1e1db54e-s ours am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA105887f99c6is in history Change-Id: Ib04616201b7a1254d71c47d917498bccec817459
This commit is contained in: