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

Change-Id: Ifeba9db6e75208b1d4d2cb82987f790355a5a2d9