Merge "Enforce PRODUCT_COMPATIBLE_PROPERTY for products shipping with Android P"
am: 8b4b0cc5a1

Change-Id: I45343a37eb4c6dcba598951454965448f3a3f5ac