Merge "Convert to android.hardware.configstore@1.1-service" into main