Merge "Add a platform-compat-config to the framework services." am: 6162efbf am: 8ee5669a am: 8c41982c am: 63331825 Change-Id: Ice86ac091e7f6cbbf8a93c91edc48a512b28d426