Merge "Revert "DO NOT MERGE Bump AOSP version to 1.7.10"" into ub-contactsdialer-i-dev