[automerger skipped] Merge "Appending per-partition os_version into AVB props" into qt-dev am: 61c5d29655 -s ours
am: 68a706d4fa -s ours
am skip reason: change_id I21a77420f2e8a3456f7a8cae5158eb8fc41319e7 with SHA1 9b54801b58 is in history

Change-Id: I25a3c7f0b798333d752e598428e75a61055485b9