Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d
am: 6f5669ed78

Change-Id: I8b2b979c4f83139b0b6d589c06ddd0fb30808cc8