Merge "Fix CTS issue in BootControl HIDL" into main