Merge "Add a sysprop-as-API for Trusty Android properties" into main