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

Change-Id: Icef85c6c1bb2493420301aa33f30f27d8b99bb3a