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

Change-Id: Ie52fbad2208d57872bfe9aaa92831e2c1375772e