Merge "Update aospify_device for T device" into main