Move <permission> tags to correct parent element
am: ba82dd3908

Change-Id: I235e92d4a0dca03d86e2e18f4caeed6ce95e211c