Merge "Set libavb version into system property for Treble OTA" am: e8311491da
am: 7b08869382

Change-Id: Ic445d12e5fc26a1a534011c7033d79e730538653