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

Change-Id: I1a6acaf7f42140a7a31dd95006a876dfd4919d9b