Merge "Set libavb version into system property for Treble OTA" into oc-dev am: a190551d2e
am: ec58710b55

Change-Id: If0fa5cf3c08f842865a0aed4f4256c8361075f08