Revert "Grant only requested permissions not the whole group."

This reverts commit e899d8d48558a6d4a8f0498c38a623115aad2205.

Bug: 23314383
Bug: 23397858
Change-Id: Ia928a4b24c60eae6b4fb16ebdbfa6b6787f6c3ae
6 files changed