Merge "Set libavb version into system property for Treble OTA"
am: e8311491da

Change-Id: I867972462df8d5830aa520a9d227ca4d8f9f8be2