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

Change-Id: I247b34651a94b5cfb66ebd81292240c1857268e9