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

Change-Id: I686647d8fa95d8fd788e76c48f518ebd51e6440e