Merge "Clean up duplicated uses-permission" am: 2bfe37de am: ed639032 am: 807b7fde am: abd5dae2 am: 001e3fad Change-Id: I4bc7812131cd83b2bd739775d205d54269b37208