Reorder permissions in android manifest
am: b5f5e8b73e

Change-Id: I1ec4cda06cd23d76e6831c2a268500dc3c88d6ac