Merge "Add compatibility metadata for Treble-enabled non-A/B OTA packages." am: 02b158d7a4
am: 7313d99f00

Change-Id: Ib1fe8ca846413cf8cd697023325c8a2a017ebd9b