Merge "Add permission for XTRA to read QDMA prop"