Merge "Add compatibility metadata for Treble-enabled non-A/B OTA packages."