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

Change-Id: I87ccf6d40babae7a176ccfdaeeb392a6422e0b86