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

Change-Id: I85cba145cfe4258697c07831358292e9f4a03477