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

Change-Id: I5f6b7f00aec5c97db365cba5113c508c80ce5392