Merge "Always apply compat changes to system apps." am: e691553aa6 am: fe17bdccf9
am: ebd7b1c2ea

Change-Id: I790378ff858887374b4384f7f78cc87af5e163f8