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

Change-Id: Ib79d2e0995e68d7a654433956275f3818ef24f01