Merge "Make LicenseActivity app compat" into ub-contactsdialer-h-dev