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

Change-Id: Idba5f257eb790e30ddb05384f495f1de38a92f0f