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

Change-Id: Ie0c81246d1434b65013f036a911f6da9a7ddd1f4