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

Change-Id: I9d17be858ed8ff66c5b3144ae1d16ab618ffd92a