Merge "Add aconfig flags for rust keystore2" into main