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

Change-Id: Ice86ac091e7f6cbbf8a93c91edc48a512b28d426