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

Change-Id: I9aed8a916fc33862596737c00bb136d6850e64f5