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