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

Change-Id: I397821341206e88b75536105b23aa096b2d7b134