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

Change-Id: Ie340605827027e34d8a13dc0de19bcc6950b8d36