Merge "Add a platform-compat-config to the framework services." am: 6162efbfa7 am: 8ee5669a5e am: 8c41982cbe am: 6333182547
am: cbadaa42a2

Change-Id: I23f9f1adc2d83ad9cbd13532ff3c7598f2457c3a