Merge "trusty: support secure storage in system-ext" into main