Merge changes from topics "rild-prop-fix", "cf-product-image" into cuttlefish-testing
* changes: Use only treble property in the cuttlefish rild Add product.img support to launcher
Loading
* changes: Use only treble property in the cuttlefish rild Add product.img support to launcher
mentioned in commit af7f0369