Merge "Reorder permissions in android manifest" into ub-contactsdialer-g-dev
am: e0636ab898

Change-Id: I29f16dde71c2c16dbb33bf7c7ed1e9eac059b40b