Merge "Clean up duplicated uses-permission" am: 2bfe37de04 am: ed63903250 am: 807b7fde15 am: abd5dae2a8
am: 001e3fad8d

Change-Id: I4bc7812131cd83b2bd739775d205d54269b37208