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

Change-Id: I80f2950ddab8f8ec9aed0699c3e89ac862c1de72