Merge "Make LicenseActivity app compat" into ub-contactsdialer-h-dev
am: 94fc608ccc

Change-Id: Id52a9eb729eaa1bbc2c0a19b07c6aa641402bb58