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

Change-Id: I33f2f6e6daa8ed236558c1bce76276959b198d36